From 1e9efe65f4bc41b887cdf1c702c59c38e24e4c17 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Sun, 18 Sep 2011 17:12:48 -0400
Subject: [PATCH] updated mailer urls

---
 .../user/password_reset_mailer/confirmation.html.erb            | 2 +-
 .../user/password_reset_mailer/reset_request.html.erb           | 2 +-
 app/views/report_mailer/moderator_report.html.erb               | 2 +-
 app/views/user_mailer/dmail_notice.html.erb                     | 2 ++
 config/application.rb                                           | 1 -
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb b/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb
index 21112a86a..d210cf186 100644
--- a/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb
+++ b/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb
@@ -2,4 +2,4 @@
 
 <p>The password for the user "<%= @user.name %>" for the website <%= Danbooru.config.app_name %> has been reset. It is now <code><%= @new_password %></code>.</p>
 
-<p>Please log in to the website and <%= link_to "change your password", edit_user_path(@user) %> as soon as possible.</p>
+<p>Please log in to the website and <%= link_to "change your password", edit_user_path(@user, :host => Danbooru.config.hostname, :only_path => false) %> as soon as possible.</p>
diff --git a/app/views/maintenance/user/password_reset_mailer/reset_request.html.erb b/app/views/maintenance/user/password_reset_mailer/reset_request.html.erb
index ad4235d30..796c609e3 100644
--- a/app/views/maintenance/user/password_reset_mailer/reset_request.html.erb
+++ b/app/views/maintenance/user/password_reset_mailer/reset_request.html.erb
@@ -1,4 +1,4 @@
 <h1>Password Reset Request</h1>
 
 <p>Someone has requested that the password for "<%= @user.name %>" for the website <%= Danbooru.config.app_name %> be reset. If you did not request this, then you can ignore this email.</p>
-<p>To reset your password, please visit <%= link_to "this link", edit_maintenance_user_password_reset_path(:key => @nonce.key, :email => @nonce.email) %>.</p>
+<p>To reset your password, please visit <%= link_to "this link", edit_maintenance_user_password_reset_path(:host => Danbooru.config.hostname, :only_path => false, :key => @nonce.key, :email => @nonce.email) %>.</p>
diff --git a/app/views/report_mailer/moderator_report.html.erb b/app/views/report_mailer/moderator_report.html.erb
index ce5c38529..03c52c026 100644
--- a/app/views/report_mailer/moderator_report.html.erb
+++ b/app/views/report_mailer/moderator_report.html.erb
@@ -16,7 +16,7 @@
   <tbody>
     <% User.find(:all, :conditions => ["level >= ?", CONFIG["user_levels"]["Test Janitor"]], :order => "level, name").each do |user| %>
       <tr>
-        <td><%= link_to user.name, user_path(user) %></td>
+        <td><%= link_to user.name, user_path(user, :host => Danbooru.config.hostname, :only_path => false) %></td>
         <td><%= user.pretty_level %></td>
         <td style="text-align: right;"><%= Post.count(:conditions => ["created_at >= ? AND approver_id = ?", 1.days.ago, user.id]) %>/<%= Post.count(:conditions => ["created_at >= ? AND (approver_id IS NOT NULL OR status = 'pending')", 1.days.ago]) %></td>
         <td style="text-align: right;"><%= Post.count(:conditions => ["created_at >= ? AND approver_id = ?", 7.days.ago, user.id]) %>/<%= Post.count(:conditions => ["created_at >= ? AND (approver_id IS NOT NULL OR status = 'pending')", 7.days.ago]) %></td>
diff --git a/app/views/user_mailer/dmail_notice.html.erb b/app/views/user_mailer/dmail_notice.html.erb
index e575bc8a4..2c0347e89 100644
--- a/app/views/user_mailer/dmail_notice.html.erb
+++ b/app/views/user_mailer/dmail_notice.html.erb
@@ -3,3 +3,5 @@
 <div>
   <%= h @dmail.body %>
 </div>
+
+<p><%= link_to "View message", dmail_path(@dmail, :host => Danbooru.config.hostname, :only_path => false) %></p>
diff --git a/config/application.rb b/config/application.rb
index 5fb50c9f0..655d64665 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -19,6 +19,5 @@ module Danbooru
     config.action_mailer.delivery_method = :smtp
     config.action_mailer.smtp_settings = {:enable_starttls_auto => false}
     config.action_mailer.perform_deliveries = true
-    config.action_mailer.default_url_options = {:host => Danbooru.config.hostname, :only_path => false}
   end
 end