Land rapid7#8338, Fix msf/core and self.class msftidy warnings

Author: Brent Cook

modules/auxiliary/admin/2wire/xslt_password_reset.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-
 class MetasploitModule < Msf::Auxiliary
 
   include Msf::Exploit::Remote::HttpClient
@@ -35,7 +33,7 @@ def initialize(info={})
       register_options(
         [
           OptString.new('PASSWORD', [ true, 'The password to reset to', 'admin'])
-        ], self.class)
+        ])
   end
 
   def run

modules/auxiliary/admin/android/google_play_store_uxss_xframe_rce.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-
 class MetasploitModule < Msf::Auxiliary
 
   include Msf::Exploit::Remote::HttpServer::HTML
@@ -61,7 +59,7 @@ def initialize(info = {})
       OptBool.new('HIDE_IFRAME', [
         true, "Hide the exploit iframe from the user", true
       ])
-    ], self.class)
+    ])
   end
 
   def on_request_uri(cli, request)

modules/auxiliary/admin/appletv/appletv_display_image.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-
 class MetasploitModule < Msf::Auxiliary
 
   include Msf::Exploit::Remote::HttpClient
@@ -37,7 +35,7 @@ def initialize(info = {})
       OptInt.new('TIME', [true, 'Time in seconds to show the image', 10]),
       OptPath.new('FILE', [true, 'Image to upload and show']),
       OptString.new('HttpPassword', [false, 'The password for AppleTV AirPlay'])
-    ], self.class)
+    ])
 
     # We're not actually using any of these against AppleTV in our Rex HTTP client init,
     # so deregister them so we don't overwhelm the user with fake options.

modules/auxiliary/admin/appletv/appletv_display_video.rb

@@ -3,7 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
 require 'uri'
 
 class MetasploitModule < Msf::Auxiliary
@@ -42,7 +41,7 @@ def initialize(info = {})
       OptInt.new('TIME', [true, 'Time in seconds to show the video', 60]),
       OptString.new('URL', [true, 'URL of video to show. Must use an IP address']),
       OptString.new('HttpPassword', [false, 'The password for AppleTV AirPlay'])
-    ], self.class)
+    ])
 
     # We're not actually using any of these against AppleTV in our Rex HTTP client init,
     # so deregister them so we don't overwhelm the user with fake options.

modules/auxiliary/admin/atg/atg_client.rb

@@ -4,8 +4,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-
 class MetasploitModule < Msf::Auxiliary
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::Tcp

modules/auxiliary/admin/aws/aws_launch_instances.rb

@@ -3,7 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
 require 'metasploit/framework/aws/client'
 
 class MetasploitModule < Msf::Auxiliary

modules/auxiliary/admin/backupexec/dump.rb

@@ -4,8 +4,6 @@
 ##
 
 
-require 'msf/core'
-
 
 class MetasploitModule < Msf::Auxiliary
 
@@ -67,7 +65,7 @@ def initialize(info = {})
             "backupexec_dump.mtf"
           ]
         ),
-      ], self.class)
+      ])
   end
 
   def run

modules/auxiliary/admin/backupexec/registry.rb

@@ -4,8 +4,6 @@
 ##
 
 
-require 'msf/core'
-
 
 class MetasploitModule < Msf::Auxiliary
 
@@ -48,7 +46,7 @@ def initialize(info = {})
               "Compromised by Metasploit!\r\n"
             ]
           ),
-        ], self.class)
+        ])
   end
 
   def auxiliary_commands

modules/auxiliary/admin/chromecast/chromecast_reset.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-
 class MetasploitModule < Msf::Auxiliary
 
   include Msf::Exploit::Remote::HttpClient
@@ -30,7 +28,7 @@ def initialize(info = {})
 
     register_options([
       Opt::RPORT(8008)
-    ], self.class)
+    ])
   end
 
   def run

modules/auxiliary/admin/chromecast/chromecast_youtube.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-
 class MetasploitModule < Msf::Auxiliary
 
   include Msf::Exploit::Remote::HttpClient
@@ -30,7 +28,7 @@ def initialize(info = {})
     register_options([
       Opt::RPORT(8008),
       OptString.new('VID', [true, 'Video ID', 'kxopViU98Xo'])
-    ], self.class)
+    ])
   end
 
   def run