#442 : Minor changes related to console error message output.

Author: michaellwest

Cognifide.PowerShell/Client/Applications/PowerShellConsole.cs

@@ -77,11 +77,15 @@ public override void HandleMessage(Message message)
             var job =
                 JobManager.GetJob(PowerShellWebService.GetJobId(message.Arguments["guid"], message.Arguments["handle"]));
 
-            IMessage iMessage;
-            while (job.MessageQueue.GetMessage(out iMessage))
+            if (job != null)
             {
-                iMessage.Execute();
+                IMessage iMessage;
+                while (job.MessageQueue.GetMessage(out iMessage))
+                {
+                    iMessage.Execute();
+                }
             }
+
             if (message.Arguments.AllKeys.Contains("finished") && message.Arguments["finished"] == "true")
             {
                 ProgressOverlay.Visible = false;

Cognifide.PowerShell/Commandlets/Security/AccountIdentity.cs

@@ -22,7 +22,7 @@ public AccountIdentity(string name)
 
             if (!Regex.IsMatch(account, @"^\w[\w\s.\\_-]*$", RegexOptions.Compiled))
             {
-                throw new ArgumentException(String.Format("The name '{0}' contains illegal characters.\n\nThe name can only contain the following characters: a-z, 0-9, periods, dashes, underscores, and spaces.", account), account);
+                throw new ArgumentException(String.Format("The name '{0}' is improperly formatted.\n\nThe name can only contain the following characters: a-z, 0-9, periods, dashes, underscores, backslashes, and spaces.", name), "name");
             }
 
             Domain = domain;

Cognifide.PowerShell/sitecore modules/PowerShell/Services/PowerShellWebService.asmx.cs

@@ -121,10 +121,10 @@ public object ExecuteCommand(string guid, string command, string stringFormat)
                         new Result
                         {
                             status = StatusError,
-                            result = output +
-                                     "\r\n[[;#f00;#000]Ooops, something went wrong... Do you need assistance?]\r\n" +
-                                     "[[;#f00;#000]Send an email with the stack trace to adam@najmanowicz.com or contact me on Twitter @AdamNaj]\r\n\r\n" +
-                                     session.GetExceptionString(ex, ScriptSession.ExceptionStringFormat.Console) + "\r\n",
+                            result = output + session.GetExceptionString(ex, ScriptSession.ExceptionStringFormat.Console) + "\r\n" +
+                                     "\r\n[[;#f00;#000]Uh oh, looks like the command you ran is invalid or something else went wrong. Is it something we should know about?]\r\n" +
+                                     "[[;#f00;#000]Please submit a support ticket here https://github.com/SitecorePowerShell/Console/ with error details, screenshots, and anything else that might help.]\r\n\r\n" +
+                                     "[[;#f00;#000]We also have a user guide here http://sitecorepowershell.gitbooks.io/sitecore-powershell-extensions/.]\r\n\r\n",
                             prompt = string.Format("PS {0}>", session.CurrentLocation)
                         });
             }
@@ -164,11 +164,16 @@ protected void RunJob(ScriptSession session, string command)
                 if (job != null)
                 {
                     job.Status.Failed = true;
-                    job.Status.Messages.Add("Ooops, something went wrong... Do you need assistance?");
-                    job.Status.Messages.Add(
-                        "Send an email with the stack trace to adam@najmanowicz.com or contact me on Twitter @AdamNaj");
-                    job.Status.Messages.Add(session.GetExceptionString(ex));
-                    job.Status.LogException(ex);
+
+                    var exceptionMessage = session.GetExceptionString(ex);
+                    if (job.Options.WriteToLog)
+                    {
+                        Log.Error(exceptionMessage, this);
+                    }
+                    job.Status.Messages.Add(exceptionMessage);
+                    job.Status.Messages.Add("Uh oh, looks like the command you ran is invalid or something else went wrong. Is it something we should know about?");
+                    job.Status.Messages.Add("Please submit a support ticket here https://github.com/SitecorePowerShell/Console/ with error details, screenshots, and anything else that might help.");
+                    job.Status.Messages.Add("We also have a user guide here http://sitecorepowershell.gitbooks.io/sitecore-powershell-extensions/.");
                 }
                 else
                 {