revert overzealous commit

git-svn-id: file:///home/svn/framework3/trunk@6961 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/core/payload/generic.rb

@@ -231,7 +231,6 @@ protected
 				raise NoCompatiblePayloadError, "Could not locate a compatible payload for #{actual_platform.names.join("/")}/#{actual_arch}"
 			else
 				dlog("Selected payload #{actual_payload.refname} from generic payload #{refname}", 'core', LEV_2)
-				print_status("Selected payload #{actual_payload.refname} from generic payload #{refname}")
 				# Share our datastore with the actual payload so that it has the
 				# appropriate values to substitute ad so on.
 				self.actual_payload.share_datastore(self.datastore)

lib/msf/ui/console/command_dispatcher/core.rb

@@ -1442,7 +1442,7 @@ class Core
 		mod.init_ui(driver.input, driver.output)
 
 		# Update the command prompt
-		driver.update_prompt("%c%cya#{mod.type}%c(%b%red#{mod.shortname}%c) ")
+		driver.update_prompt("#{mod.type}(#{mod.shortname}) ")
 	end
 	
 	#
@@ -1745,7 +1745,7 @@ protected
 
 	def show_options(mod) # :nodoc:
 		mod_opt = Serializer::ReadableText.dump_options(mod, '   ')
-		print("\nModule options (#{mod.fullname}):\n\n#{mod_opt}\n") if (mod_opt and mod_opt.length > 0)
+		print("\nModule options:\n\n#{mod_opt}\n") if (mod_opt and mod_opt.length > 0)
 	
 		# If it's an exploit and a payload is defined, create it and
 		# display the payload's options

lib/msf/ui/console/driver.rb

@@ -21,7 +21,7 @@ class Driver < Msf::Ui::Driver
 	ConfigCore  = "framework/core"
 	ConfigGroup = "framework/ui/console"
 
-	DefaultPrompt     = "%u%whimsf%c"
+	DefaultPrompt     = "%umsf"
 	DefaultPromptChar = ">%c"
 
 	#

lib/rex/ui/text/shell.rb

@@ -160,12 +160,12 @@ module Shell
 		# Substitute colors
 		new_prompt.gsub!(/%u/, colorize('underline'))
 		new_prompt.gsub!(/%b/, colorize('bold'))
-		new_prompt.gsub!(/%cya/, colorize('cyan'))
 		new_prompt.gsub!(/%c/, colorize('clear'))
 		new_prompt.gsub!(/%red/, colorize('red'))
 		new_prompt.gsub!(/%grn/, colorize('green'))
 		new_prompt.gsub!(/%blu/, colorize('blue'))
 		new_prompt.gsub!(/%yel/, colorize('yellow'))
+		new_prompt.gsub!(/%cya/, colorize('cyan'))
 		new_prompt.gsub!(/%whi/, colorize('white'))
 		new_prompt.gsub!(/%mag/, colorize('magenta'))
 		new_prompt.gsub!(/%blk/, colorize('black'))