Merge branch 'master' of github.com:wpscanteam/wpscan

lib/common/collections/wp_items/detectable.rb

@@ -58,7 +58,6 @@ class WpItems < Array
         ProgressBar.create(
           format: '%t %a <%B> (%c / %C) %P%% %e',
           title: '  ', # Used to craete a left margin
-          length: 120,
           total: targets_size
         )
       end

lib/common/models/wp_user/brute_forcable.rb

@@ -66,7 +66,6 @@ class WpUser < WpItem
         ProgressBar.create(
           format: '%t %a <%B> (%c / %C) %P%% %e',
           title: "  Brute Forcing '#{login}'",
-          length: 120,
           total: passwords_size
         )
       end

wpscan.rb

@@ -260,15 +260,17 @@ def main
           show_progression: false
         )
       )
-      puts
+
       if wp_users.empty?
         puts 'We did not enumerate any usernames :('
-        puts 'Try supplying your own username with the --username option'
+
-        puts
+        if wpscan_options.wordlist
-        exit(1)
+          puts 'Try supplying your own username with the --username option'
+          puts
+          exit(1)
+        end
       else
         puts green('[+]') + " We found the following #{wp_users.size} user/s :"
-
         wp_users.output(margin_left: ' ' * 4)
       end