php_include - added @wchen-r7's code improvements

Author: g0tmi1k

lib/msf/core/exploit/http/server.rb

@@ -501,11 +501,7 @@ def remove_resource(name)
 		# Guard against removing resources added by other modules
 		if @my_resources.include?(name)
 			@my_resources.delete(name)
-			begin
-				service.remove_resource(name)
-			rescue ::Exception => e
-				print_error("Exception: #{e.class} #{e}")
-			end
+			service.remove_resource(name)
 		end
 	end
 

modules/exploits/unix/webapp/php_include.rb

@@ -92,9 +92,6 @@ def datastore_headers
 	end
 
 	def php_exploit
-		# Set verbosity level
-		verbose = datastore['VERBOSE'].to_s.downcase
-
 		uris = []
 
 		tpath = normalize_uri(datastore['PATH'])
@@ -137,7 +134,7 @@ def php_exploit
 		uris.each do |uri|
 			break if session_created?
 
-			print_status("Sending: #{rhost+tpath+uri}") if verbose == "true"
+			vprint_status("Sending: #{rhost+tpath+uri}")
 			begin
 				if http_method == "GET"
 					response = send_request_raw( {