Fixing merge conflicts

Author: tasos-r7

lib/msf/core/auxiliary/web.rb

@@ -179,10 +179,11 @@ def log_fingerprint( opts = {} )
 			:blame		=> details[:blame],
 			:category	=> details[:category],
 			:description => details[:description],
-			:confidence  => details[:category] || opts[:confidence] || 100,
 			:owner	  => self
 		}
 
+		info[:confidence]  = calculate_confidence( info )
+
 		report_web_vuln( info )
 
 		print_good "	FOUND(#{mode.to_s.upcase}) URL(#{location})"
@@ -211,10 +212,11 @@ def log_resource( opts = {} )
 			:blame		 => details[:blame],
 			:category	 => details[:category],
 			:description => details[:description],
-			:confidence  => details[:category] || opts[:confidence] || 100,
 			:owner		 => self
 		}
 
+		info[:confidence]  = calculate_confidence( info )
+
 		report_web_vuln( info )
 
 		print_good "	VULNERABLE(#{mode.to_s.upcase}) URL(#{target.to_url})"
@@ -278,7 +280,7 @@ def process_vulnerability( element, proof, opts = {} )
 		report_web_vuln( info )
 
 		print_good "	VULNERABLE(#{mode.to_s.upcase}) URL(#{target.to_url})" +
-					   " PARAMETER(#{element.altered}) VALUES(#{element.params})"
+						" PARAMETER(#{element.altered}) VALUES(#{element.params})"
 		print_good "		 PROOF(#{proof})"
 	end