consistent naming

lib/msf/http/wordpress/helpers.rb

@@ -65,7 +65,7 @@ module Msf::HTTP::Wordpress::Helpers
 	# @param comments_enabled [Boolean] If true try to find a post id with comments enabled, otherwise return the first found
 	# @param login_cookie [String] A valid login cookie to perform the bruteforce as an authenticated user
 	# @return [Integer,nil] The post id, nil when nothing found
-	def wordpress_helper_get_valid_post_id(range, comments_enabled=false, login_cookie=nil)
+	def wordpress_helper_bruteforce_valid_post_id(range, comments_enabled=false, login_cookie=nil)
 		range.each { |id|
 			vprint_status("#{peer} - Checking POST ID #{id}...") if (id % 100) == 0
 			body = wordpress_helper_check_post_id(wordpress_url_post(id), comments_enabled, login_cookie)

lib/msf/http/wordpress/posts.rb

@@ -29,10 +29,10 @@ module Msf::HTTP::Wordpress::Posts
 	# @param max_post_id [Integer] The last post_id to bruteforce
 	# @param login_cookie [String] If set perform the bruteforce as an authenticated user
 	# @return [Integer,nil] The post id, nil when nothing found
-	def wordpress_get_valid_post_id(min_post_id, max_post_id, login_cookie=nil)
+	def wordpress_bruteforce_valid_post_id(min_post_id, max_post_id, login_cookie=nil)
 		return nil if min_post_id > max_post_id
 		range = Range.new(min_post_id, max_post_id)
-		wordpress_helper_get_valid_post_id(range, false, login_cookie)
+		wordpress_helper_bruteforce_valid_post_id(range, false, login_cookie)
 	end
 
 	# Tries to bruteforce a valid post_id with comments enabled
@@ -41,10 +41,10 @@ module Msf::HTTP::Wordpress::Posts
 	# @param max_post_id [Integer] The last post_id to bruteforce
 	# @param login_cookie [String] If set perform the bruteforce as an authenticated user
 	# @return [Integer,nil] The post id, nil when nothing found
-	def wordpress_get_valid_post_id_with_comments_enabled(min_post_id, max_post_id, login_cookie=nil)
+	def wordpress_bruteforce_valid_post_id_with_comments_enabled(min_post_id, max_post_id, login_cookie=nil)
 		return nil if min_post_id > max_post_id
 		range = Range.new(min_post_id, max_post_id)
-		wordpress_helper_get_valid_post_id(range, true, login_cookie)
+		wordpress_helper_bruteforce_valid_post_id(range, true, login_cookie)
 	end
 
 	# Checks if the provided post has comments enabled

modules/exploits/unix/webapp/php_wordpress_total_cache.rb

@@ -68,10 +68,6 @@ class Metasploit3 < Msf::Exploit::Remote
 				])
 	end
 
-	def peer
-		return "#{rhost}:#{rport}"
-	end
-
 	def require_auth?
 		@user = datastore['USERNAME']
 		@password = datastore['PASSWORD']
@@ -124,7 +120,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			print_status("#{peer} - Trying to brute force a valid POST ID...")
 			min_post_id = datastore['MIN_POST_ID']
 			max_post_id = datastore['MAX_POST_ID']
-			@post_id = wordpress_get_valid_post_id_with_comments_enabled(min_post_id, max_post_id, @cookie)
+			@post_id = wordpress_bruteforce_valid_post_id_with_comments_enabled(min_post_id, max_post_id, @cookie)
 			if @post_id.nil?
 				fail_with(Failure::BadConfig, "#{peer} - Unable to post without a valid POST ID where comment")
 			else