RHPG in wmap-2.5.4

- old
+ new

@@ -9,11 +9,11 @@
 def print_usage
 	puts "Program to lookup then merge the site details into RHPG asset spreadsheet. \nUsage: RHPG [RHPG.csv]"
 end
 
 # Lookup the site store for a domain; then return the fingger print info of the site
-def site_lookup(domain)
+def site_tracker_lookup(domain)
   tracker=Wmap::SiteTracker.instance
 	tracker.verbose=false
   #first order search
   tracker.known_sites.each do |key,val|
     if key.include?(domain.strip.downcase) && key.include?("https")
@@ -31,11 +31,11 @@
   tracker=nil
   return [nil]*9
 end
 
 # look up the wp site data store for a domain; then return the wp finger print info: [is_wp?,wp_ver]
-def wp_site_lookup(domain)
+def wp_tracker_lookup(domain)
   tracker=Wmap::WpTracker.new(:verbose=>false)
 	# first order
 	tracker.known_wp_sites.each do |key,val|
 		if key.include?(domain.strip.downcase) && val
 			ver=tracker.wp_ver(key)
@@ -61,11 +61,11 @@
   return [nil,nil]
 end
 
 # perform the wpscan on a site
 def wpscan(domain)
-	url=site_lookup(domain)[0]
+	url=site_tracker_lookup(domain)[0]
 	return nil if url.nil?
 	if url.include?("https")
 		command="wpscan --disable-tls-checks --ignore-main-redirect --url=" + url + " -o " + domain + ".wpscan"
 	else
 		command="wpscan --ignore-main-redirect --url=" + url + " -o " + domain + ".wpscan"
@@ -91,10 +91,10 @@
 					unless File.exist?(row[0]+".wpscan")
 						wpscan(row[0])
 					end
 				end
 =end
-        my_row = row + site_lookup(row[0]) + wp_site_lookup(row[0])
+        my_row = row + site_tracker_lookup(row[0]) + wp_tracker_lookup(row[0])
       else
         my_row = row + [nil]*10
       end
     else
       my_row = row + ["Website","Primary IP","Port","Hosting Status","Server","Response Code","MD5 Finger-print","Redirection","Timestamp", "WordPress", "WordPress Version"]