touch up lib/rex/mime/message.rb

Author: kernelsmith

lib/rex/mime/message.rb

@@ -24,11 +24,11 @@ def initialize(data=nil)
       self.header.parse(head)
       ctype = self.header.find('Content-Type')
 
-      if ctype and ctype[1] and ctype[1] =~ /multipart\/mixed;\s*boundary="?([A-Za-z0-9'\(\)\+\_,\-\.\/:=\?^\s]+)"?/
+      if ctype && ctype[1] && ctype[1] =~ /multipart\/mixed;\s*boundary="?([A-Za-z0-9'\(\)\+\_,\-\.\/:=\?^\s]+)"?/
         self.bound = $1
         chunks = body.to_s.split(/--#{self.bound}(--)?\r?\n/)
         self.content = chunks.shift.to_s.gsub(/\s+$/, '')
-        self.content << "\r\n" if not self.content.empty?
+        self.content << "\r\n" unless self.content.empty?
 
         chunks.each do |chunk|
           break if chunk == "--"
@@ -88,15 +88,13 @@ def mime_defaults
   def add_part(data='', content_type='text/plain', transfer_encoding="8bit", content_disposition=nil)
     part = Rex::MIME::Part.new
 
-    if (content_disposition)
+    if content_disposition
       part.header.set("Content-Disposition", content_disposition)
     end
 
-    if (content_type)
-      part.header.set("Content-Type", content_type)
-    end
+    part.header.set("Content-Type", content_type) if content_type
 
-    if (transfer_encoding)
+    if transfer_encoding
       part.header.set("Content-Transfer-Encoding", transfer_encoding)
     end
 
@@ -127,24 +125,15 @@ def add_part_inline_attachment(data, name)
   def to_s
     header_string = self.header.to_s
 
-    if header_string.empty?
-      msg = ''
-    else
-      msg = force_crlf(self.header.to_s + "\r\n")
-    end
-
-    unless self.content.blank?
-      msg << force_crlf(self.content + "\r\n")
-    end
+    msg = header_string.empty? ? '' : force_crlf(self.header.to_s + "\r\n")
+    msg << force_crlf(self.content + "\r\n") unless self.content.blank?
 
     self.parts.each do |part|
       msg << force_crlf("--" + self.bound + "\r\n")
       msg << part.to_s
     end
 
-    if self.parts.length > 0
-      msg << force_crlf("--" + self.bound + "--\r\n")
-    end
+    msg << force_crlf("--" + self.bound + "--\r\n") if self.parts.length > 0
 
     msg
   end