From 30306a775af74e1fe080590998a71a4c7e64ad12 Mon Sep 17 00:00:00 2001
From: randomhuman <kjhoulihan@gmail.com>
Date: Sun, 5 Sep 2010 21:44:46 +0100
Subject: [PATCH] Made it impossible to create a user with names containing
 spaces and prevented passwords from being echoed after enter is pressed.

---
 OpenSim/Framework/Console/ConsoleBase.cs      | 51 +++++++++++++++++++
 OpenSim/Framework/Console/LocalConsole.cs     |  5 +-
 OpenSim/Region/Framework/Scenes/Scene.cs      |  5 +-
 .../UserAccountService/UserAccountService.cs  |  6 ++-
 4 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index aab920b09a..22ce88060c 100755
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -89,6 +89,57 @@ namespace OpenSim.Framework.Console
 
             return ret;
         }
+                
+        public string CmdPrompt(string p, List<char> excludedCharacters)
+        {
+            bool itisdone = false;
+            string ret = String.Empty;
+            while (!itisdone)
+            {
+                itisdone = true;
+                ret = CmdPrompt(p);
+                
+                foreach (char c in excludedCharacters)
+                {
+                    if (ret.Contains(c.ToString()))
+                    {
+                        System.Console.WriteLine("The character \"" + c.ToString() + "\" is not permitted.");
+                        itisdone = false;
+                    }
+                }
+            }
+
+            return ret;
+        }
+
+        public string CmdPrompt(string p, string def, List<char> excludedCharacters)
+        {
+            bool itisdone = false;
+            string ret = String.Empty;
+            while (!itisdone)
+            {
+                itisdone = true;
+                ret = CmdPrompt(p, def);
+                
+                if (ret == String.Empty)
+                {
+                    ret = def;
+                }
+                else
+                {
+                    foreach (char c in excludedCharacters)
+                    {
+                        if (ret.Contains(c.ToString()))
+                        {
+                            System.Console.WriteLine("The character \"" + c.ToString() + "\" is not permitted.");
+                            itisdone = false;
+                        }
+                    }
+                }
+            }
+
+            return ret;
+        }
 
         // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
         public string CmdPrompt(string prompt, string defaultresponse, List<string> options)
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index a3036d0df6..c968031c11 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -461,7 +461,8 @@ namespace OpenSim.Framework.Console
                         SetCursorLeft(0);
                         y = SetCursorTop(y);
 
-                        System.Console.WriteLine("{0}{1}", prompt, cmdline);
+                        System.Console.WriteLine();
+                        //Show();
 
                         lock (cmdline)
                         {
@@ -486,7 +487,7 @@ namespace OpenSim.Framework.Console
                             }
                         }
 
-                        AddToHistory(cmdline.ToString());
+                        //AddToHistory(cmdline.ToString());
                         return cmdline.ToString();
                     default:
                         break;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7ce95a7299..6fa78e0cfd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1159,8 +1159,9 @@ namespace OpenSim.Region.Framework.Scenes
             while (m_regInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null)
             {
                 MainConsole.Instance.Output("The current estate has no owner set.");
-                string first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test");
-                string last = MainConsole.Instance.CmdPrompt("Estate owner last name", "User");
+                List<char> excluded = new List<char>(new char[1]{' '});
+                string first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test", excluded);
+                string last = MainConsole.Instance.CmdPrompt("Estate owner last name", "User", excluded);
 
                 UserAccount account = UserAccountService.GetUserAccount(m_regInfo.ScopeID, first, last);
 
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 326e502017..65c247f334 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -296,13 +296,15 @@ namespace OpenSim.Services.UserAccountService
             string lastName;
             string password;
             string email;
+            
+            List<char> excluded = new List<char>(new char[]{' '});
 
             if (cmdparams.Length < 3)
-                firstName = MainConsole.Instance.CmdPrompt("First name", "Default");
+                firstName = MainConsole.Instance.CmdPrompt("First name", "Default", excluded);
             else firstName = cmdparams[2];
 
             if (cmdparams.Length < 4)
-                lastName = MainConsole.Instance.CmdPrompt("Last name", "User");
+                lastName = MainConsole.Instance.CmdPrompt("Last name", "User", excluded);
             else lastName = cmdparams[3];
 
             if (cmdparams.Length < 5)