bugfixing

lib/wpscan/modules/wp_item.rb

@@ -17,11 +17,11 @@
 #++
 
 module WpItem
-  attr_accessor :path, :base_url, :wp_content_dir
+  attr_accessor :path, :url, :wp_content_dir
   @version = nil
 
   def get_url
-    URI.parse("#{@base_url.to_s}#@wp_content_dir/#@path")
+    URI.parse("#{@url.to_s}#@wp_content_dir/#@path")
   end
 
   def get_url_without_filename

lib/wpscan/modules/wp_login_protection.rb

@@ -38,7 +38,7 @@ module WpLoginProtection
 
           return @login_protection_plugin = WpPlugin.new(
               :name => plugin_name,
-              :base_url => @uri.to_s
+              :url => @uri.to_s
           )
         end
       end

lib/wpscan/modules/wp_plugins.rb

@@ -43,7 +43,7 @@ module WpPlugins
 
     temp.each do |item|
       plugins << WpPlugin.new(
-          :base_url       => item[:base_url],
+          :url            => item[:url],
           :name           => item[:name],
           :path           => item[:path],
           :wp_content_dir => wp_content_dir

lib/wpscan/modules/wp_themes.rb

@@ -34,7 +34,7 @@ module WpThemes
 
     temp.each do |item|
       themes << WpPlugin.new(
-          :base_url       => item[:base_url],
+          :url            => item[:url],
           :name           => item[:name],
           :path           => item[:path],
           :wp_content_dir => wp_content_dir

lib/wpscan/wp_detector.rb

@@ -60,7 +60,7 @@ class WpDetector
     names.uniq!
 
     names.each do |item|
-      items << { :base_url =>  url, :name => item, :path => "#{type}/#{item}" }
+      items << { :url =>  url, :name => item, :path => "#{type}/#{item}" }
     end
     items
   end

lib/wpscan/wp_enumerator.rb

@@ -24,7 +24,7 @@ class WpEnumerator
   # ==== Attributes
   #
   # * +targets+ - targets to enumerate
-  # * * +:base_url+ - Base URL
+  # * * +:url+ - Base URL
   # * * +:wp_content+ - wp-content directory
   # * * +:path+ - Path to plugin
   # * +type+ - "plugins" or "themes", item to enumerate

lib/wpscan/wp_plugin.rb

@@ -24,7 +24,7 @@ class WpPlugin < Vulnerable
   attr_reader :name
 
   def initialize(options = {})
-    @base_url       = options[:url]
+    @url            = options[:url]
     @path           = options[:path]
     @wp_content_dir = options[:wp_content_dir]
     @name           = options[:name] || extract_name_from_url(get_url)
@@ -32,7 +32,7 @@ class WpPlugin < Vulnerable
     @vulns_xpath    = "//plugin[@name='#@name']/vulnerability"
     @version        = nil
 
-    raise("base_url not set") unless @base_url
+    raise("url not set") unless @url
     raise("path not set") unless @path
     raise("wp_content_dir not set") unless @wp_content_dir
     raise("name not set") unless @name

lib/wpscan/wp_theme.rb

@@ -24,7 +24,7 @@ class WpTheme < Vulnerable
   attr_reader :name, :style_url, :version
 
   def initialize(options = {})
-    @base_url       = options[:url]
+    @url            = options[:url]
     @name           = options[:name] || extract_name_from_url(get_url)
     @path           = options[:path]
     @wp_content_dir = options[:wp_content_dir]
@@ -34,7 +34,7 @@ class WpTheme < Vulnerable
     @version        = options[:version]
     @style_url      = options[:style_url]
 
-    raise("base_url not set") unless @base_url
+    raise("url not set") unless @url
     raise("path not set") unless @path
     raise("wp_content_dir not set") unless @wp_content_dir
     raise("name not set") unless @name