get rid of the single-character escapes so we're less likely to see accidental color substitutions

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

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

@@ -187,8 +187,8 @@ class Core
 	# Display one of the fabulous banners.
 	#
 	def cmd_banner(*args)
-		banner  = "%cya" + Banner.to_s + "%c\n\n"
-		banner << "       =[ %yelmetasploit v#{Msf::Framework::Version} [core:#{Msf::Framework::VersionCore} api:#{Msf::Framework::VersionAPI}]%c\n"
+		banner  = "%cya" + Banner.to_s + "%clr\n\n"
+		banner << "       =[ %yelmetasploit v#{Msf::Framework::Version} [core:#{Msf::Framework::VersionCore} api:#{Msf::Framework::VersionAPI}]%clr\n"
 		banner << "+ -- --=[ "
 		banner << "#{framework.stats.num_exploits} exploits - #{framework.stats.num_auxiliary} auxiliary\n"
 		banner << "+ -- --=[ "
@@ -1490,7 +1490,7 @@ class Core
 		mod.init_ui(driver.input, driver.output)
 
 		# Update the command prompt
-		driver.update_prompt("#{mod.type}(%red#{mod.shortname}%c) ")
+		driver.update_prompt("#{mod.type}(%red#{mod.shortname}%clr) ")
 	end
 
 	#

lib/msf/ui/console/driver.rb

@@ -21,8 +21,8 @@ class Driver < Msf::Ui::Driver
 	ConfigCore  = "framework/core"
 	ConfigGroup = "framework/ui/console"
 
-	DefaultPrompt     = "%umsf%c"
-	DefaultPromptChar = "%c>"
+	DefaultPrompt     = "%undmsf%clr"
+	DefaultPromptChar = "%clr>"
 
 	#
 	# The console driver processes various framework notified events.

lib/rex/post/meterpreter/ui/console.rb

@@ -28,7 +28,7 @@ class Console
 		if (Rex::Compat.is_windows())
 			super("meterpreter")
 		else
-			super("%umeterpreter%c")
+			super("%undmeterpreter%clr")
 		end
 
 		# The meterpreter client context

lib/rex/ui/text/color.rb

@@ -66,9 +66,9 @@ module Color
 		str.gsub!(/%dcya/, colorize('dark', 'cyan'))
 		str.gsub!(/%dwhi/, colorize('dark', 'white'))
 		str.gsub!(/%dmag/, colorize('dark', 'magenta'))
-		str.gsub!(/%u/, colorize('underline'))
-		str.gsub!(/%b/, colorize('bold'))
-		str.gsub!(/%c/, colorize('clear'))
+		str.gsub!(/%und/, colorize('underline'))
+		str.gsub!(/%bld/, colorize('bold'))
+		str.gsub!(/%clr/, colorize('clear'))
 
 		str
 	end

lib/rex/ui/text/output.rb

@@ -43,15 +43,15 @@ class Output < Rex::Ui::Output
 
 
 	def print_error(msg = '')
-		print_line("%red[-]%c #{msg}")
+		print_line("%red[-]%clr #{msg}")
 	end
 
 	def print_good(msg = '')
-		print_line("%grn[+]%c #{msg}")
+		print_line("%grn[+]%clr #{msg}")
 	end
 
 	def print_status(msg = '')
-		print_line("%blu[*]%c #{msg}")
+		print_line("%blu[*]%clr #{msg}")
 	end
 
 	def print_line(msg = '')