From eda3b04c1aad4f04760efd2bda22a50b24ec412e Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 8 Feb 2006 23:51:10 +0000
Subject: [PATCH] simplify

---
 stepmania/src/ScreenPackages.cpp | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/stepmania/src/ScreenPackages.cpp b/stepmania/src/ScreenPackages.cpp
index 99cf2e5dd9..fa811162e2 100644
--- a/stepmania/src/ScreenPackages.cpp
+++ b/stepmania/src/ScreenPackages.cpp
@@ -385,22 +385,18 @@ void ScreenPackages::HTMLParse()
 	UpdateLinksList();
 }
 
-RString ScreenPackages::URLEncode( const RString &URL )
+RString ScreenPackages::URLEncode( const RString &sInput )
 {
-	RString Input = StripOutContainers( URL );
-	RString Output;
-
-	for( unsigned k = 0; k < Input.size(); k++ )
+	RString sOutput;
+	for( unsigned k = 0; k < sInput.size(); k++ )
 	{
-		char t = Input.at( k );
-		if ( ( t >= '!' ) && ( t <= 'z' ) )
-		{
-			Output+=t;
-		}
+		char t = sInput[k];
+		if( t >= '!' && t <= 'z' )
+			sOutput += t;
 		else
-			Output += "%" + ssprintf( "%X", t );
+			sOutput += "%" + ssprintf( "%X", t );
 	}
-	return Output;
+	return sOutput;
 }
 
 RString ScreenPackages::StripOutContainers( const RString & In )
@@ -523,7 +519,7 @@ void ScreenPackages::EnterURL( const RString & sURL )
 	}
 	//Continue...
 
-	sAddress = URLEncode( sAddress );
+	sAddress = URLEncode( StripOutContainers(sAddress) );
 
 	if ( sAddress != "/" )
 		sAddress = "/" + sAddress;