From f465bb875b457420e73e0149ca136e129fa813b2 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sun, 17 Sep 2017 21:04:13 -0400 Subject: [PATCH] Fix tabbing --- TGCommandLine/Program.cs | 62 ++++++++++++++-------------- TGControlPanel/Login.cs | 6 +-- TGServerService/Administration.cs | 20 ++++----- TGServerService/ServerService.cs | 2 +- TGServiceInterface/Administration.cs | 24 +++++------ TGServiceInterface/Server.cs | 10 ++--- 6 files changed, 62 insertions(+), 62 deletions(-) diff --git a/TGCommandLine/Program.cs b/TGCommandLine/Program.cs index 0af883b430..6c1e5f9aef 100644 --- a/TGCommandLine/Program.cs +++ b/TGCommandLine/Program.cs @@ -23,26 +23,26 @@ namespace TGCommandLine { badConnectionString = true; break; - } - var addrport = splits[1].Split(':'); - if (addrport.Length != 2) - { - badConnectionString = true; - break; - } - var username = userpass[0]; + } + var addrport = splits[1].Split(':'); + if (addrport.Length != 2) + { + badConnectionString = true; + break; + } + var username = userpass[0]; var password = userpass[1]; var address = addrport[0]; - ushort port; - try - { - port = Convert.ToUInt16(addrport[1]); - } - catch - { - badConnectionString = true; - break; - } + ushort port; + try + { + port = Convert.ToUInt16(addrport[1]); + } + catch + { + badConnectionString = true; + break; + } if(String.IsNullOrWhiteSpace(username) || String.IsNullOrWhiteSpace(password) || String.IsNullOrWhiteSpace(address)) { badConnectionString = true; @@ -128,19 +128,19 @@ namespace TGCommandLine switch (NextCommand.ToLower()) { case "remote": - Console.Write("Enter server address: "); - var address = Console.ReadLine(); - Console.Write("Enter server port: "); - ushort port; - try{ - port = Convert.ToUInt16(Console.ReadLine()); - } - catch - { - Console.WriteLine("Error: Bad port!"); - break; - } - Console.Write("Enter username: "); + Console.Write("Enter server address: "); + var address = Console.ReadLine(); + Console.Write("Enter server port: "); + ushort port; + try{ + port = Convert.ToUInt16(Console.ReadLine()); + } + catch + { + Console.WriteLine("Error: Bad port!"); + break; + } + Console.Write("Enter username: "); var username = Console.ReadLine(); Console.Write("Enter password: "); var password = ReadLineSecure(); diff --git a/TGControlPanel/Login.cs b/TGControlPanel/Login.cs index 0daba18361..d37e5a6c8b 100644 --- a/TGControlPanel/Login.cs +++ b/TGControlPanel/Login.cs @@ -10,9 +10,9 @@ namespace TGControlPanel { InitializeComponent(); IPTextBox.Text = Properties.Settings.Default.RemoteIP; - var Config = Properties.Settings.Default; - UsernameTextBox.Text = Config.RemoteUsername; - PortSelector.Value = Config.RemotePort; + var Config = Properties.Settings.Default; + UsernameTextBox.Text = Config.RemoteUsername; + PortSelector.Value = Config.RemotePort; AcceptButton = RemoteLoginButton; } diff --git a/TGServerService/Administration.cs b/TGServerService/Administration.cs index 9725c37342..844cf61c36 100644 --- a/TGServerService/Administration.cs +++ b/TGServerService/Administration.cs @@ -115,15 +115,15 @@ namespace TGServerService return Properties.Settings.Default.RemoteAccessPort; } - /// - public string SetRemoteAccessPort(ushort port) - { - if (port == 0) - return "Cannot bind to port 0"; - var Config = Properties.Settings.Default; - Config.RemoteAccessPort = port; - Config.Save(); - return null; - } + /// + public string SetRemoteAccessPort(ushort port) + { + if (port == 0) + return "Cannot bind to port 0"; + var Config = Properties.Settings.Default; + Config.RemoteAccessPort = port; + Config.Save(); + return null; + } } } diff --git a/TGServerService/ServerService.cs b/TGServerService/ServerService.cs index 55ffe3c4dc..1191daeae6 100644 --- a/TGServerService/ServerService.cs +++ b/TGServerService/ServerService.cs @@ -109,7 +109,7 @@ namespace TGServerService if (oldVersion == newVersion && newVersion == 0) //chat refactor Properties.Settings.Default.ChatProviderData = "NEEDS INITIALIZING"; //reset chat settings to be safe } - + //you should seriously not add anything here //Use OnStart instead public TGServerService() diff --git a/TGServiceInterface/Administration.cs b/TGServiceInterface/Administration.cs index 527acc5479..5e16dc4221 100644 --- a/TGServiceInterface/Administration.cs +++ b/TGServiceInterface/Administration.cs @@ -8,21 +8,21 @@ namespace TGServiceInterface [ServiceContract] public interface ITGAdministration { - /// - /// Get the port used for remote operation - /// - /// The port used for remote operation + /// + /// Get the port used for remote operation + /// + /// The port used for remote operation [OperationContract] - ushort RemoteAccessPort(); + ushort RemoteAccessPort(); - /// - /// Set the port used for remote operation - /// Requires a service restart to take effect - /// - /// The new port to use for remote operation - /// null on success, error message on failure + /// + /// Set the port used for remote operation + /// Requires a service restart to take effect + /// + /// The new port to use for remote operation + /// null on success, error message on failure [OperationContract] - string SetRemoteAccessPort(ushort port); + string SetRemoteAccessPort(ushort port); /// /// Returns the name of the windows group allowed to use the service other than administrator diff --git a/TGServiceInterface/Server.cs b/TGServiceInterface/Server.cs index 6aca1d6dab..11d6e8a4c0 100644 --- a/TGServiceInterface/Server.cs +++ b/TGServiceInterface/Server.cs @@ -53,7 +53,7 @@ namespace TGServiceInterface public static void SetRemoteLoginInformation(string address, ushort port, string username, string password) { HTTPSURL = address; - HTTPSPort = port; + HTTPSPort = port; HTTPSUsername = username; HTTPSPassword = password; } @@ -63,14 +63,14 @@ namespace TGServiceInterface /// /// The type of the component to retrieve /// - public static T GetComponent() - { + public static T GetComponent() + { var ToT = typeof(T); if (!ValidInterfaces.Contains(ToT)) throw new Exception("Invalid type!"); var InterfaceName = typeof(T).Name; - if (HTTPSURL == null) - return new ChannelFactory(new NetNamedPipeBinding { SendTimeout = new TimeSpan(0, 10, 0) }, new EndpointAddress(String.Format("net.pipe://localhost/{0}/{1}", MasterInterfaceName, InterfaceName))).CreateChannel(); + if (HTTPSURL == null) + return new ChannelFactory(new NetNamedPipeBinding { SendTimeout = new TimeSpan(0, 10, 0) }, new EndpointAddress(String.Format("net.pipe://localhost/{0}/{1}", MasterInterfaceName, InterfaceName))).CreateChannel(); //okay we're going over var binding = new WSHttpBinding();