jro_apps/redmine Commit - r5696:01c531166245

remove trailing white-spaces from mailer model source....

Toshi MARUYAMA -

r5696:01c531166245

parent child

Context file:

r5696:01c531166245

Collapse all files

app/models/mailer.rb +21 -21

                  h = h.to_s.gsub(%r{\/.*$}, '') unless Redmine::Utils.relative_url_root.blank?
                  { :host => h, :protocol => Setting.protocol }
                end
                # Builds a tmail object used to email recipients of the added issue.
                #
                # Example:
                       :added_to_url => added_to_url
                  render_multipart('attachments_added', body)
                end
                # Builds a tmail object used to email recipients of a news' project when a news item is added.
                #
                # Example:
                       :news_url => url_for(:controller => 'news', :action => 'show', :id => news)
                  render_multipart('news_added', body)
                end
                # Builds a tmail object used to email recipients of a news' project when a news comment is added.
                #
                # Example:
                  render_multipart('news_comment_added', body)
                end
-               # Builds a tmail object used to email the recipients of the specified message that was posted.
+               # Builds a tmail object used to email the recipients of the specified message that was posted.
                #
                # Example:
                #   message_posted(message) => tmail object
                       :message_url => url_for(message.event_url)
                  render_multipart('message_posted', body)
                end
-               # Builds a tmail object used to email the recipients of a project of the specified wiki content was added.
+               # Builds a tmail object used to email the recipients of a project of the specified wiki content was added.
                #
                # Example:
                #   wiki_content_added(wiki_content) => tmail object
                       :wiki_content_url => url_for(:controller => 'wiki', :action => 'show', :project_id => wiki_content.project, :id => wiki_content.page.title)
                  render_multipart('wiki_content_added', body)
                end
-               # Builds a tmail object used to email the recipients of a project of the specified wiki content was updated.
+               # Builds a tmail object used to email the recipients of a project of the specified wiki content was updated.
                #
                # Example:
                #   wiki_content_updated(wiki_content) => tmail object
                  return false if (recipients.nil? || recipients.empty?) &&
                                  (cc.nil? || cc.empty?) &&
                                  (bcc.nil? || bcc.empty?)
                  # Set Message-Id and References
                  if @message_id_object
                    mail.message_id = self.class.message_id_for(@message_id_object)
                  if @references_objects
                    mail.references = @references_objects.collect {|o| self.class.message_id_for(o)}
                  end
                  # Log errors when raise_delivery_errors is set to false, Rails does not
                  raise_errors = self.class.raise_delivery_errors
                  self.class.raise_delivery_errors = true
                    deliver_reminder(assignee, issues, days) if assignee && assignee.active?
                  end
                end
                # Activates/desactivates email deliveries during +block+
                def self.with_deliveries(enabled = true, &block)
                  was_enabled = ActionMailer::Base.perform_deliveries
                  @initial_language = current_language
                  set_language_if_valid Setting.default_language
                  from Setting.mail_from
                  # Common headers
                  headers 'X-Mailer' => 'Redmine',
                          'X-Redmine-Host' => Setting.host_name,
                    recipients.delete(@author.mail) if recipients
                    cc.delete(@author.mail) if cc
                  end
                  notified_users = [recipients, cc].flatten.compact.uniq
                  # Rails would log recipients only, not cc and bcc
                  mylogger.info "Sending email notification to: #{notified_users.join(', ')}" if mylogger
                  # Blind carbon copy recipients
                  if Setting.bcc_recipients?
                    bcc(notified_users)
                #
                # https://rails.lighthouseapp.com/projects/8994/tickets/2338-actionmailer-mailer-views-and-content-type
                # https://rails.lighthouseapp.com/projects/8994/tickets/1799-actionmailer-doesnt-set-template_format-when-rendering-layouts
                def render_multipart(method_name, body)
                  if Setting.plain_text_mail?
                    content_type "text/plain"
                def self.controller_path
                  ''
                end unless respond_to?('controller_path')
                # Returns a predictable Message-Id for the given object
                def self.message_id_for(object)
                  # id + timestamp should reduce the odds of a collision
                  # as far as we don't send multiple emails for the same object
-                 timestamp = object.send(object.respond_to?(:created_on) ? :created_on : :updated_on)
+                 timestamp = object.send(object.respond_to?(:created_on) ? :created_on : :updated_on)
                  hash = "redmine.#{object.class.name.demodulize.underscore}-#{object.id}.#{timestamp.strftime("%Y%m%d%H%M%S")}"
                  host = Setting.mail_from.to_s.gsub(%r{^.*@}, '')
                  host = "#{::Socket.gethostname}.redmine" if host.empty?
                  "<#{hash}@#{host}>"
                end
                private
                def message_id(object)
                  @message_id_object = object
                end
                def references(object)
                  @references_objects ||= []
                  @references_objects << object
                end
                def mylogger
                  RAILS_DEFAULT_LOGGER
                end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages